Fix #9
Merge branch 'master' of github.com:kastaneda/tonic_test