Address build issues on mac OS-X
Merge pull request #83 from sashafrey/master

Address build issues on mac OS-X