fix deprecation warnings and whitespace
Merge pull request #1 from nickdesaulniers/master

fix deprecation warnings and whitespace