Fixed cyclical include bug (issue #1)