Improve square
and squareFilled
figures
#42
Merged
square
and squareFilled
figures
#42