Merge pull request #1 from svanharmelen/dev

Initial commit