Fix for issue #17
Merge branch 'master' of https://github.com/diegosala/valitron