Merge pull request #1 from Fivell/master

master updated