Fixed namespace issues with lates nightly.
Merge pull request #42 from leonkunert/master

Fixed namespace issues with latest nightly.