Addressed issue #14
Udpated for 1.20 release