(#41) Missing credits !
(#41) Missing credits
Merge branch 'master' into debug/20131108