Merge pull request #11 from kshirley/master

Master