Merge pull request #22 from trywildcard/staging

Merge into master
Merge pull request #23 from trywildcard/staging

Merge into master
Merge pull request #26 from trywildcard/staging

Merge into master
Merge pull request #30 from trywildcard/staging

Merge into master
Merge branch 'master' into staging
updating JAR with fixed tests