Fixed spacing issue
Sync with David'd repo
Fixed all the minor bugs
Removed unnecessary usage of tee
Merge pull request #2 from avinashThummala/master

Fixed some minor bugs