Many bug fixes
Merge branch 'master' of https://github.com/niketkandya/plt2013