Fixed issue 1 and prepare to tagg v0.4.1