update from dev100
Merge pull request #3 from dev100/patch-2

update from dev100