Merged with original Version 1.4