Fix/#7

@build maser