V1.4

Revert "Merge pull reques t from master