Deckerbd

Pull request for Benjamin Decker (deckerbd)