Feature/157 always use std class as return type