- move more code into if block
Merge pull request #106 from aschnell/master

- move more code into if block