replaced exports with module.exports
Merge branch 'feature/general' into develop
Merge branch 'develop'
version bump