Merge pull request #44 from Ralith/fix-undefs

Fix undefs