Merge pull request #1 from robertsd/master

I recommend you "upgrade"
removing derrick
removing derrick