Prepare for further development.
Merge branch 'master' of https://github.com/mauricedchateau/nemo.git