Fix building errors
Merge pull request #23 from spolu/master

Fix building errors