Commit 0af882c5 authored by Bram Veenboer's avatar Bram Veenboer

Merge branch 'issue-29'

parents 6f3afa82 b54060d4