Issue #1 resolved.
Merge branch 'staranjeet-master'