Conflict merge update
Merge pull request #17 from rocketu/layout

Conflict merge update