Added support for wider range of values for fields

Should fix issue #13 
Remove empty line