Merge pull request #87 from tevans/master

OF-421: More cleanup for MINA API changes