Merge pull request #31 from flubbes/update-1

merge update-1 into design