Merge pull request #1 from lucemia/master

update from lucemia
Merge pull request #20 from apua/master

Merge pull request #1 from lucemia/master