Merge pull request #19 from andrei-ivanov/fix-build

Fix build