Merge pull request #1 from viewna/master

update