Fixes #149
Merge pull request #150 from lindegroup/fix-#149

Fixes #149
Merge branch 'v1.1-alpha' into casper-love
  -- bring in fix for #149