JarbasAl Merge pull request #7 from gras64/master