small optimization
Merge pull request #121 from groessler/something_to_pull

small optimization
Merge remote-tracking branch 'upstream/master'