improvements and fix for 0.0.5, see CHANGELOG