Working on the wrapper
Small changes to the test app
Merge branch 'Wrapper'