bug-25 - Peter Parker
Merge pull request #2 from john-hu/bug-25-2

bug-25 - Peter Parker, r=thomas.