Merge pull request #7 from mitya57/master

Miscellanneous fixes
fix filling (did not work)
fix filling (did not work)
fix filling (did not work)