Fixing Issue #14
Issue #15 - adding ml8 support