2010-08-24 moel.mich Fixed Issue 105 and Issue 106.