Better title logic
Prepare for release 0.0.5