V0.1.1a: final commit, HOTFIX