Merge pull request #2 from retspen/master

update