Added some test (and especially one exposing #48)
Merge remote-tracking branch 'origin/master'