please accept my homework
Merge
Merge branch 'smola970-master'