Fix for issue 92 and improve marker files.