improvements based on feedback
Merge pull request #44 from iniju/v2.0.1-left-over-msg

improvements based on feedback