Gpii 726

http://issues.gpii.net/browse/GPII-726
@dimokas could you please fix the whitespace issue for the indentation here?