Version 1.3

Some optimalizations