Merge pull request #6 from calvinbrown085/master

Merge 2