bugfix #165
Merge branch 'master' of megaweb.dyndns.biz:zork-framework.git