Merge pull request #36 from th7/usability

Usability
merge resolution
merge resolution