first batch of changes

Made by Sean
Merge pull request #8 from seanofarrell/master

first batch of changes