Small bug fixes, initial realse 0.1.0