Merge pull request #20 from krobelus/master

Fixed compilation.