Merge pull request #1 from noonee/master

updatechanges
Update asdf
Merge pull request #1 from harrisbk/master

let me see your changes