Merge pull request #26 from szabba/develop

Also load on 'FileType' event