-over-writing 2013.03.11 version
-changed integer_variables to discrete_variables