make it work again + improvements
Merge pull request #5 from wvengen/feature/fix-basic

make it work again + improvements