Transferring blueprint from apiary.io
#424 Transferring blueprint from apiary.io
#424 Transferring blueprint from apiary.io
Merge pull request #433 from joola/master

rebase of master on develop