update
issue #81
Merge branch 'design'