cleaned code a bit, integrated roughness again
Merge branch 'master' of https://github.com/johsh/emovis