bugfix
bugfixes (variable initializations)
Now that we have the missing file, let's include it
Merge pull request #5 from marado/master

some more bugfixes