tested on OS X 10.9 Mavericks

ran `make test`, tests passed
Merge pull request #69 from kneufeld/master

tested on OS X 10.9 Mavericks