Moved all variables to a single line ... also fixed a typo in an include...

This should fix issue #2.