Dev master 1.1

Pull #22 with correction..