Merge pull request #48 from svanharmelen/dev