first commit
Merge pull request #2 from JesseAllardice/master

Second commit