richfitz Merge pull request #30 from Pseudopooja/master