solution DIWM-1
solution for DIWM-2
Merge pull request #4 from harsha89/master

solution DIWM-1