fix rogue fragment problem Fixes #19 Fixes #20
merge with master