Updates for 1.4
Merge pull request #6 from glickbot/master

Updates for 1.4