Small enhancements
Prepare 0.5.0 release