Merged "Demo" code into master for final code review.