Update for ToPyType/FromPyType split
Merge pull request #1 from stygstra/master

Update for ToPyType/FromPyType split