fixes fill color on shapes; refactor to remove g child element
Merge pull request #95 from AlexanderPico/master

fixes fill color on shapes; refactor to remove g child element