Fixed fill and outline behavior
Merge pull request #475 from jds7717/master

Fixed fill and outline behavior