Issue 12

Pull request for solution to issue 12