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

Updates for Mother editing.