Merging
Little housekeeping to check the status for porting Python 2 to 3