Added credit card validation and fixes for issue #127