modified the classpath and added unit tests to issue #11.