Adding a lot more comments to functions and making the code slightly less verbose, also removing puts from the rspec test
Merge remote-tracking branch 'origin/master'