Removed some commenting...
Merge origin/master