task 10
task 11
task 12
task 13
task 14
task 15
Merge pull request #1 from vatseek/dev

update master