V1.2: First Project Commit
Merge remote-tracking branch 'origin/master'