from VPS
Merge pull request #4 from duxan/develop

from VPS