Committing work from PI
Merge branch 'master' of https://github.com/fleurette/icg48

Merge