Merging 1.3

1.3 introduces changes to close #6