Merge Pull request #2

Pull changes from master