Added currency validation
comment amends