Fixed major bug 59
Merge branch 'master' of https://github.com/HashanP/Pandora