OAAM paper final

title also changed
Merge pull request #23 from ggreif/patch-1

OAAM paper final