Merge pull request #1 from stackkian/master

First merge