manually merged pull request #63 from @XxCoolGamesxX