Commited for Issue 1. The issue has been fixed.