adding str
Merge branch 'master' of github.com:Chocolateam/GHC-2014