Pull tonymalatanos changes into my fork