Version 1.5b - fixed build script and refactor

See CHANGES.txt file