Issues #8 has been completed.

Merging branch into master.