Fixed major issues
Merge pull request #3 from scarescrow/sagnik

Fixed major issues