Added help text
Fixed order of attributes mattering
Modified some tests
Merge branch 'issue-1'