Commit for issues 15-04-2015

Change-Id: I5194e111a86bc3bc27ae2823a77797f817ea1843