Merge with sklnet