Latest changes from Voltan
Merge pull request #1 from mambax7/master

Latest changes from Voltan