added test
new master
Merge branch 'dev'