Merge pull request #1 from bdukes/master

Edit Mode & NAnt