tasks 31, 32
Merge pull request #2 from elip60/master

tasks 31, 32