Dev

Merging in closing of issue #125 into master for final deployment to Heroku