Merge pull request #250 from conz27/master