Merge pull request #31 from jkuk/master

minor fixes in manager classes