Fixed identation
Migrated parser from String to Text
Merge branch 'master' of github.com:dancingrobot84/bro