Prepare for v0.5 releasing. Small cleanup, issue #27