Tested, fixed issues and updated readme