Updated according 4-15 nightly (15/04/2013)
Merge pull request #2 from gaich/patch-2

Updated according 4-15 nightly (15/04/2013)