Fixed issue #33 and migrated to 4.2.1
Removed old lib