Update for 1.5+
Merge pull request #12 from dmulloy2/master

Update for 1.5+