BUG : fixed bug issue #156
Merge branch 'test_opt'