Updating and extending functionality
Merge branch 'master' of github.com:apilipov/twftaf