Merge pull request #2 from lcycat/master

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

Merge pull request #2 from lcycat/master