fuji7l

I solved it, but it's probably not the ideal way, not even sure a pull request would work with this. It's not ideal, not fully tested, but I've made progress...

I'll see what I can do. I only have access to a mac while at work, so I'll try to get something together - can't guarantee when though.