Contribution Request: http://sourceforge.net/tracker/index.php?func=detail&aid=1831781&group_id=176962&atid=883808