Updated to match format expected by PeeWee
Merge branch 'hotfix/1.2.2'