Enhancements

Resolves #42 #43