Merge pull request #31 from flubbes/update-1

merge update-1 into design
Merge pull request #40 from flubbes/Design

Merge pull request #31 from flubbes/update-1