Merge pull request #3 from siudev/master