Merge pull request #347 from CGijbels/master

Fix for issue #346
Fix #351 - Now tracking state as we go up & down
Fix #335 - Update URI templates to the latest version
Update prior to 1.3.2 release
Fix #357 - Removed offending code that was causing the issue
Prep prior to 1.3.3 release
Merge remote-tracking branch 'upstream/master' into Issue341