Merged files from last implementation, created develop branch, modified some comments