review findings
Merge pull request #55 from ursenzler/master

review findings