Merge pull request #1 from Kefkius/master