Milestone v1.3

This addresses issue #112.

To use this, a new release will need to be made. Might be worth doing the rest of the 1.3 milestone tickets ...