Feature #46, ok it's enough until now, added more test