Enhancements

Version 1.2