Issue #6 - added missing files from previous commit