Cleaning up before final productiopn version
Added minor updates from cleaned branch

Updated to v 1.0.0