Fixing bugs and paths
Merge pull request #1 from panfantastic/master

Tested on a clean OSX Lion install.