Add mopaas support
Merge branch 'master' of https://github.com/eliu03/WFProject