Merge branch 'release/0.3.2'
Merge branch 'develop'
Updated link to configuration docs
Merge pull request #12 from parkr/patch-1

Updated link to configuration docs
updated some stuff