- shorted code
Merge pull request #87 from aschnell/master

- shorted code