Version bump to 1.2.5
Fix for Issues #19 and #25
Fix up code as per review notes
Merge remote-tracking branch 'origin/pr/28'