Merge pull request #15 from wagnert/master

witch to new manager interface