Serious bug fixed
Merge branch 'master' into bug/serious-bug
Merge pull request #2 from rajiteh/bug/serious-bug

Serious bug fixed