Merge pull request #1 from PPP12345/master

merge
Merge branch 'master' into PPP12345
fun
Merge pull request #5 from ciil/master

fun