Bug fixes
Merge branch 'master' of https://github.com/alyh/Acid-Rain