Added more awesome.
Merge branch 'dev'