Merge pull request #37 from mhotan/master

Test