fixes for defaults
minor cleanup, 0.1.4
changelog update
Merge branch 'master' into gh-pages

* master:
  changelog update
  minor cleanup, 0.1.4
  fixes for defaults