Pulling changes since original fork

Pulling changes since original fork via github web interface.