bugfix + added some comments (0.0.2)

Signed-off-by: Wouter Vroege <wouter@woutervroege.nl>