Merge pull request #157 from worry127722/dev-1.4.0

Dev 1.4.0