Issue 1

Pull Request for integrating #1 into master.