Merge pull request #1 from notmyname/saio_update

first pass