Enhancements

Resolves #43