Issues/713@v2

Resolved #712 
Resolved #713