Merge pull request #1 from psake/master

Update from psake:master