Merge pull request #3 from TopherJonesy/master

1.4