several improvements
Merge branch 'master' of github.com:johannhof/pinha