Merge pull request #4 from nwalker/master

nobody follows standard =(
a bit better aac support.