Allow following to be either int or boolean

Closes #36