Merge pull request #1 from lucemia/master

update from lucemia