first revision, sorry for huge commit...
Merge branch 'master' of https://github.com/andreasbock/pseudo