Bugfixing and working on #6.