Removed debugging outputs
Merge origin/master