Added defaults for memory and time
Merge remote-tracking branch 'origin/master'