0.3

Some enhancements and/or fixings