Fix issues #51, #54
Merge branch 'master' into trigger
Remove trigger access type from config files
Merge pull request #56 from Masadow/trigger

Triggers fix