The fixed final version (nimrod please check code before  pushing it)
Merge branch 'master' of https://github.com/theNimja/YRS2013ABERDEEN