Issue 04

Merging with master with few minor bug fixes faced during test.