Hotfix/v0.6.1

I think I'm High!! Sorry guys, it's a long story.