Bug fix for order of execution and small enhancements; see ChangeLog.txt
Added new files for tag 31_05_2013