Merge pull request #8 from ksuther/master

Fixed crash on 10.7 and warning