Merge pull request #1 from MichaelKaeser/feature1

Pull this feature1