Make it build
Merge pull request #1 from dolzenko/master

Make it build