Merge pull request #25 from jaredbischof/master

Update to latest AWE code.
Updated to latest AWE code.