Resolves issue #5 & #6