core functionality added
Test added
Merge branch 'add-test'