1.4.0
Merge pull request #14 from KoryNunn/master

1.4.0