Merge pull request #616 from alanrenouf/dev

Merge dev to master - version 6.25

Merge pull request #571 from alanrenouf/dev

6.24

Fixed merge conflict

Missed a conflict when merging

Bumping version number

Calling this 6.22 - other than a couple of minor changes, the last few changes seem to be pretty stable.

Happy New Year everyone :)

Version 6.21

Probably about time be bumped the version number...been pretty bad about remembering to do this!

Bump version number

New version number to start version tagging. This will help us track changes between releases.