add a test for #20, #15
Merge branch 'master' of github.com:simonmar/alex

* 'master' of github.com:simonmar/alex:
  Fixed Basic Wrapper bug