Fixing few issues
reversing to original value
Merge pull request #1 from mambax7/master

Pull Mamba's updates into the dev branch