Incorporated version 2.1.4 of original lib
Version 2.1.4.0