Updated with better string handling
Version Bump