add simple test
Merge branches 'master' and 'test'