removed ticket 181 and moved to branch
re revert to alpha
merged