updates based on user feedback
Merge pull request #5 from labyrwa/master

updates based on user feedback