Merge pull request #1 from rockzill/master

TEST=)