squashed commit fixing github issues 1, 2, 3