fixed #140
Merge branch 'feature/140-large-butler-downloads' into dev