Merge pull request #2 from andirotter/master

update