Merge pull request #1 from Izikiel/master

pull