Partial revert of last commit because I overlooked some things
Merge pull request #4 from MiracleM4n/master

Fix last commit.