Small improvements for version 0.0.5