Made a few bugfixes.
Version 0.2.1