added abaghan and gabor, closes #115, closes #123