merge changes from Chris (codedance) into this repo
whoops, forgot to add files first