Update fork from original

Updating my fork from original project.