Merge factory and git master
Merge pull request #8 from varkoly/master

Merge factory and git master