merging changes from giventocode
Merge pull request #12 from ryancrawcour/master

merging changes from giventocode