Merge pull request #218 from progracqteur/master

git pull stable