for mama
Merge pull request #4 from villa7/master

for mama