Partial merge of @covard's Pull request #70
Merge remote-tracking branch 'upstream/master'
remove gem file