Merge First working version from develop to master