Merge pull request #1 from ctfs/master

Updates