Update JAO
Merge pull request #58 from justinjamesjao/master

Update JAO