Separate layer definitions and hero options
Merge pull request #386 from igorko/master

Separate layer definitions and hero options