Merge pull request #17 from jvkumar/3

Fixes#3 WIP managers
Fixes#3 WIP