fixed #6 : added default values
added general types to random result