Upgraded to version 2.2 of FW1.
Code formatting.
Upgraded to latest version of DI1.
Updated changelog.
Merge pull request #122 from simonbingham/develop