Merge branch 'development'
* [x] Relevant Documentation
* [x] Informative commit messages
* [x] A passing build for the most recent commit
* [x] Rubocopped code
* [x] Clean, nice, neat, elegant code
* [x] Tested!
* [x] No more debugging puts statements
See merge request !17