Feature testing

Prepare to merge into to_master branch