Transferring blueprint from apiary.io
Merge branch 'master' into develop

* master:
  Transferring blueprint from apiary.io