Merge pull request #1 from obsy/master

update