Merge pull request #526 from n-shiota/topodev

Merged Pankaj's refactored code