Merge pull request #49 from ybunyak/master

Fix build errors