Fix #90
Merge branch 'design' into dev