Adding support for the animator proxy on OS X
Style fixes
Merge pull request #41 from pfandrade/upstream

Adding support for the animator proxy on OS X