New drawable types and some fixes
Merge pull request #5 from Ivan1pl/master

New drawable types and some fixes