Merge pull request #1 from Activiti/master

Update from original