Merge pull request #2 from GamerSource/small_fixes