update gem file & gitignore
misc
Merge remote-tracking branch 'origin/master' into develop