diff --git a/Z80/inc/Disassembler.h b/Z80/inc/Disassembler.h
index a29c11d..a016d7d 100644
--- a/Z80/inc/Disassembler.h
+++ b/Z80/inc/Disassembler.h
@@ -14,6 +14,7 @@ namespace EightBit {
 
 		static std::string state(Z80& cpu);
 		std::string disassemble(Z80& cpu);
+		std::string disassemble(Z80& cpu, uint16_t address);
 
 		static std::string flag(uint8_t value, int flag, std::string represents);
 		static std::string flags(uint8_t value);
diff --git a/Z80/src/Disassembler.cpp b/Z80/src/Disassembler.cpp
index b963ef4..5e35419 100644
--- a/Z80/src/Disassembler.cpp
+++ b/Z80/src/Disassembler.cpp
@@ -165,9 +165,13 @@ std::string EightBit::Disassembler::alu(int which) {
 }
 
 std::string EightBit::Disassembler::disassemble(Z80& cpu) {
+	return disassemble(cpu, cpu.PC().word);
+}
+
+std::string EightBit::Disassembler::disassemble(Z80& cpu, uint16_t address) {
 	m_displaced = m_prefixCB = m_prefixDD = m_prefixED = m_prefixFD = false;
 	std::ostringstream output;
-	disassemble(output, cpu, cpu.PC().word);
+	disassemble(output, cpu, address);
 	return output.str();
 }