Merge pull request #1 from Emdek/master

v