merge #350.
merge #350.

Nevtep/omniwallet,achamely/omniwallet,habibmasuro/omniwallet,habibmasuro/omniwallet,dexX7/omniwallet,habibmasuro/omniwallet,dexX7/omniwallet,VukDukic/omniwallet,VukDukic/omniwallet,Nevtep/omniwallet,achamely/omniwallet,dexX7/omniwallet,achamely/omniwallet,habibmasuro/omniwallet,achamely/omniwallet,Nevtep/omniwallet,OmniLayer/omniwallet,OmniLayer/omniwallet,Nevtep/omniwallet,OmniLayer/omniwallet,OmniLayer/omniwallet,VukDukic/omniwallet