Fixes for #17.
added settings
Merge branch 'coderReview-master'