Merge pull request #37 from CYBERDEViLNL/patch-1