Making a fixed version for initial release
Merging from develop
Merge branch 'develop'
Fixing keywords