- simplification
Merge pull request #69 from aschnell/master

- simplification