cleaup
merge
Merge pull request #6 from stewartimel/merge

Merge