Minor fixes for code review #66
Merge pull request #331 from ptiz/master

Minor fixes for code review #66