Merge pull request #14 from hey-you-project/dev_branch

Dev branch