first attempt 24/08/2013
second attempt 13/09/2013
stable and nice for release
Merge branch 'develop' to create version 0.9 Beta