Part of the optimization feature
Merge pull request #48 from diogodadalt/master

Part of the optimization feature