Merge branch 'wcatron-master'; modified to support suffix ordinal on any numeric unit and fixed travis