Merge pull request #15 from suhailvs/master

some fixes in round3