Fixed issue #1 w/ @Climax777 fix, tests, updates