Merge pull request #68 from fotonauts/better

a bit better
Merge branch 'tengen-master'