Merge pull request #3 from lcycat/master

updating from master
Merge pull request #15 from kye-13/master

Merge pull request #3 from lcycat/master