#15 remove int casting, because using regex check as int.
Merge pull request #17 in master
Merge pull request #16
Merge pull request #16 in develop