Fixed issue 123
merging to dev