Updated to latest AWE code
Merge pull request #24 from jaredbischof/master

Updated to latest AWE code