Commit 25 - 4:00

May be the last commit before a final release