Bug fixes
Merge pull request #3 from MinekoRox/master

Removed useless things