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