Merge pull request #218 from progracqteur/master

git pull stable
Merge pull request #219 from progracqteur/stable

Merge pull request #218 from progracqteur/master