v1.1 - bugfixing, improvement