23-04-2014 - Pull request from ieru to ak