Fixing a issues #25, #26 and #29
Merge pull request #30 from svanharmelen/dev

Fixing a issues #25, #26 and #29