Merge pull request #26 from Staance/jul29_milestone

Minor merge touches.