code review
Merge pull request #1 from mweitzel/master

code review