Merge pull request #21 from wagnert/master

Switch to new manager interface