Merge pull request #43 from ysb33r/master

Some fixes towards ISSUE #42
Fixed #37 - Performance improvement in extracting GEMs