Coped with latest 'Twitter Ruby Gem'  and refactoring, bugfix