removed ticket 181 and moved to branch