Fix audit complaints
Merge branch 'master' of github.com:mkarneim/javawriter