Bug fixes.
Merged
Merge branch 'master' of https://github.com/abhi11/tanglu-dak