Merge pull request #725 from salix5/patch

Patch
new
new
fix
fix
fix