Merge branch 'i003' of http://github.com/bbsszz/freendime into i003
Merge branch 'i003' of http://github.com/bbsszz/freendime into i003