Improved Uchiwa script

Closes #6