Bugfixing and resolving #1