Add failing tests for the first part of issue #177
Fix failing tests
Add failing test for the second part of the issue
Fix failing tests
Merge pull request #182 from calestar/fix_177

Fix 177