Fixed: Choosing either only filled or contour plot, not both
Merge pull request #3 from es5nhc/master

Some fixes.