mainly changes due to several reviews
Merge pull request #2 from MMKrell/patch_nov_2013

mainly changes due to several reviews