Merge pull request #21 from jaredbischof/master

Updated to latest AWE code.
Updated AWE code