added puts
Merge origin/master