2012-07-17 moel.mich Attempt at fixing Issue 253 without breaking Issue 159 once more.
2012-07-14 moel.mich Fixed Issue 269.