#251 implemented

#251 implemented, let's merge