first from raring
Merge branch 'master' of https://github.com/spiceice/Ahmed