tweaks for 1.4.0
Merge pull request #613 from shackbarth/master

tweaks for 1.4.0