#58 - added more options