merge #57 and fix gemspec conflict, bump version to v0.10.11