Cleaned up and fixed item prefix issue, closing issue #36