Initial commit. Added working version of code.
Merge remote-tracking branch 'origin/master'