Alexander-0x80 Merge pull request #2 from zemora/master …