Updated to the final copy. close #43