Merge pull request #9 from xoppa/master

Fix compiler issues
Remove old code