More cleanups for Issue #25
Merge branch 'snapshot' of github.com:mcaprari/botto into snapshot