Fixed bug where @ sign would disappear after switch; Removed unnessary code; Updated Readme for newest trunk; Thanks to alezakos