Adding angelu's code. 2nd commit.