Merge pull request #1 from aryaxt/master

update master