No inclusion of main class in cli controller; comment updates
Merge branch 'dev'