Final Commit 16-09-2014