GITHUB Issue #4 Fixed