- shorter code
Merge pull request #88 from aschnell/master

- shorter code