Working on getting includes to work properly.
Bug fix for #21