2013-06-13: refactorings
fixed flag file
fixed flag file