Merged with changes of Johan Jeuring. Bumped to version 0.0.3