removed commented lines in source code
corrections after setting -Wall
Merge branch 'Development'

Development merge (Added -Wall)