v 0.2 - bugfixes and refacturing