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