Merge pull request #17 from taabi/master

Merge pull request #16 from taabi/sstehly-master