Merge pull request #380 from mhaskel/test