Release 2

Some enhancements