Merge pull request #3 from lcycat/master

updating from master