Added option 'colon' which allows entry of '615' and '1815'.
Version bumped from 1.2.6 to 1.3
Merge branch 'release-1.3'