added spyros changes
Merge branch 'master' of https://github.com/jaivalis/aa