merge from asciimoo master