Update to 1.5

Code refactoring
Public methods