Version 1.7

Another optimizing of source code.