2.22 2018-05-12 MANWAR - Merged PR #10: Amend to prevent uninitialised warning error, thanks @lharey.