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

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