Update to current library 5/8/2014