- shorter and nicer code
Merge pull request #78 from aschnell/master

- shorter and nicer code