20130421_v2
Merge branch 'master' into node_godong