- propagated the changes in the master branch to the O3A branch
Merge pull request #111 from ptosco/O3DAlign_29Sept2013

- propagated the changes in the master branch to the O3A branch