working commit
Merge branch 'master' of https://github.com/4g/pictorg