Better boilerplate code
Merge pull request #1 from adcloud/better-boilerplate-code

Better boilerplate code