fix for 0.13 and cleanup
Merge pull request #650 from kcrayon/master

fix for 0.13 and cleanup