Almost final update

This version will be very close to the version that I use at Vancouver Maker Faire 2013