Added initial v1_6_R1 support. Testing still required before merge into master and submission.

Work on #1