Bug fixes
Merge branch 'master' of github.com:mosf1k/tada