Merge pull request #1 from EOL-Labs/master

upstream pull
Merge pull request #2 from EOL-Labs/master

pull upstream
Merge pull request #3 from EOL-Labs/master

pull upstream
Merge pull request #4 from EOL-Labs/master

upstream pull
Merge pull request #19 from cbebry/master

upstream pull