merge commit
merge commit
removed stale locs
added tests for trivial cases
Merge pull request #37 from gem/fix-1144388

Fix 1144388