Merge pull request #18 from aidanoleary/master

pull request
Final commit.
pull