comments and minor changes
Merge branch 'testing' of github.com:pdendek/CoAnSys into testing