Added jmcunningham's fork