Modifed according to dropbox 2014-4-23 fils