test whitespace commit
add helper methods
Merge branch 'master' into cdh4