A few minor fixes on pr #49
Merge pull request #1 from dotta/update/pr/49

A few minor fixes on pr #49