Stable 01/10

Signed-off-by: Eric <mr.waideman@gmail.com>