Merge pull request #41 from nvanson/master

Tim-Ide-Changes