Merge pull request #8 from penkar/master

Merge pull request #10 from bcaytonanderson/master