Do not test under PyPy on Travis
Merge branch 'master' into 47-strict-assembling
Add tests for #47 (failing ATM)