Mege pull request #1 from Mu4a4eS/master