merge
Merge branch 'devel'
fix gems
merge
fix merging error
add test environment