Fixes because of Lion compatibility
Merge pull request #3 from branok/master

Workarounds to work on Lion.