Final Commit 30-10-2014