Merge pull request #14 from talarico43/development

Merge master and development branches (1.1)
Transferring blueprint from apiary.io