Bugfixing V1.01 now