Fix #126 #124 #123
Merge pull request #127 from ericvincenterv/master

Fix #126 #124 #123