Close #66 - merging up from development to live