ISSUE-7 - add native code
ISSUE-8 - add code to js
Merge branch 'feature/ISSUE-8' into develop