Merge pull request #11 from gg-rip-integration/develop

Merge pull request #10 from gg-rip-integration/master