Add defaced GSF ID, source refactoring
Merge pull request #151 from vipere/master

Add defaced GSF ID and some refactoring