closes #34 e #36