Merge pull request #9 from kevmoo/master

more code review