Merge pull request #3 from mcdlee/master

add air