merge 0.2.2 into master
merge 0.3.0
Merged 0.3.1
Fixed somethign in tests
listified contribs
listified contribs