Merge pull request #16 from taabi/sstehly-master

Merge pull request #15 from taabi/master
Merge pull request #17 from taabi/master

Merge pull request #16 from taabi/sstehly-master