upd
Merge pull request #3 from luxcoding/master

upd