Hotfix/0.6.3

quick review