Changed from int to string
Merged with master