Issue #45

- use layout from master branch