Commit 2013-06-14: lot of modifications