Merge pull request #3 from ctsssd/master

update