Merge pull request #32 from svanharmelen/dev