Slight tweak to instruction implementation.
Merge branch 'issue-60' into develop