Merge pull request #2 from simple-stack/master

pulling in changes
Merge pull request #26 from EntropyWorks/master

pulling in changes