Merge default action options
Merge pull request #4 from Sfynx/master

Merge default action options