Merge pull request #29 from martinmicunda/master

Fix the broken build #26
fixing #30
Merge pull request #31 from chrislaughlin/master

PR: fixing #30