Fixed a few spliting bugs
Fixed bugs
Merge branch 'develop'
Merge branch 'master' of github.com:fractalsoft/lexical_units