Fixed compilation error
Commented some code
Merge branch 'development'