fix #31 -- tried to work around #29 but no luck. Might have more edge cases
Merge remote-tracking branch 'origin/master'