Committing latest changes before code cleanup
Experimenting with numexpr
to save memory and increase speed
Merge remote-tracking branch 'origin/master'