Fixed circural dependency. Fixes #14