Merge pull request #4 from neilellis/master

Pulling changes added to master