Fixed many bugs
Merge branch 'branch1' of https://github.com/hardbot/americano into branch1