merged + cool artistic bug ;)
bug fixed