merge resolution
merge resolution
Merge pull request #39 from th7/usability

Usability