Improved Readme, updated version, minor code tweeks