-D doesn't build on OSX Lion
Merge pull request #47 from PatrickHeneise/master

-D doesn't build on OSX Lion