Merge pull request #1 from Rauks/master

Get last changes from Rauks/master