Update 7/9/2014

Pull request to merge with imtapps's derrick branch