Merge pull request #1 from deviba01/master

catching up