Enhancements

closes #8