Merge pull request #360 from mhaskel/test