Merge pull request #22 from jaredbischof/master

Updated AWE code
Updated AWE code