Merge pull request #3 from tandraschko/master

TOMEE-3774