Issue #14 : bugfix and improvement of downloading changes