jcasoft Merge pull request #1 from gras64/master