Since I didn't had a chance to review this see #109.