Merge pull request #77 from smsm1/master