Shane

Pull changes in from my branch to the master