moved repetitive code to master
Merge pull request #23 from Hot-N-Seek/cameronh

moved repetitive code to master