Issue 95

@xPaw review please?