Major fix
Merge pull request #1 from suumitgeek/bugs

Bug fixes in branch