Updates for Mother editing.
Merge pull request #35 from jasich/master

Updates for Mother editing.