fix #333
misc fixes
Merge pull request #334 from bobtwinkles/master

Updated dependencies