Initial merge from phjanderson github