fix #118 #117 #116 #115
Merge pull request #119 from ericvincenterv/master

fix #118 #117 #116 #115