Merge pull request #1 from SanomaCZ/master

merged original ella-attachments with sanoma ella-attachments