More improvements.
Merge branch 'master' of github.com:/roeles/openccn2