fix for issue0
Fix to issue01
Merge branches 'issue' and 'issue1' into dev_1.0