#19 - Minor changes