Merge pull request #20 from kiswa/dev

Dev
Fix bug introduced in automatic actions.
Merge pull request #22 from kiswa/master

Merge master into dev