#50 - memory tuning
Merge remote-tracking branch 'origin/master'