Merge pull request #52 from shidasan/fix_porting

Fix porting
fixed timeline