Added a test on issue43
Merge branch 'master' into test-data-storage
Merge branch 'test-data-storage'