Fixing bug.
Adding prototype assignment.
Merge remote-tracking branch 'upstream/master'
Initial commit - uploading code