Merge pull request #1 from Slicer/master

Merge in changes from base Slicer repo