strip unneeded whitespace from the data
added TODOs
Merge branch 'release/20140712-02'