GITHUB issue #5 Fixed