Merge pull request #33 from Hot-N-Seek/cameronh

fixed minor issues