Forgot to update branch-alias [ci skip]
Add license and more tests on travis
Merge pull request #11 from timoschaefer/1.2

Merge branch '1.2'