Merge pull request #23 from jaredbischof/master

Updated AWE code