from e31 to e49
Merge pull request #12 from Wizmann/master

from e31 to e49