Merge pull request #1 from balabhv/master

Updates