Added major changes of mine since forked.