Updates and improvements
Updated version