Merge pull request #2 from pencil2d/master

pull 1 pencil2d -> shoshon/pencil