Changes made from fork

Before James was a contributor to the open city version, we forked the repo so he could push to Github.