Merge pull request #1 from stackkian/master

First merge
Merge pull request #2 from stackkian/dev-branch

Merge pull request #1 from stackkian/master