update
add to test
Merge pull request #2 from Jayin/master

Master