fixing linear dependency issues. Fixes issue #11.