Changes based on wmayer's comments

See thread at http://forum.freecadweb.org/viewtopic.php?f=10&t=7045