Issue 35

@tomaszdurka please review