Merge pull request #143 from mistoll/master