Merge pull request #20 from wagnert/master

Switch to new manager interface