merging in changes
Merge pull request #63 from blairprophett/master

merging in changes