Merge pull request #1 from Chuddee/master

12
add3
Merge pull request #3 from olegpl/master

www