Merge pull request #20 from mladenw/master

Pull request from Master MS Sun 8:20 AM
Merge pull request #21 from mladenw/ForEditing

Merge pull request #20 from mladenw/master