Merge pull request #3 from Activiti/master