Merge pull request #1 from bigjey/master

first pull
br commit
mergetool