Closes #26 and Closes #27

Demo code comments