add test case
add test case
Merge branch 'develop' into bitdewy/master