final version
Merge branch 'master' of https://github.com/yoavram/GRC2013