Merge pull request #2 from lcycat/master

updating from master