Update gemspec
Merge branch 'test-gem' into develop
Update require paths for gem
Merge branch 'test-gem' into develop