added fix 54
hotfixed
Merge branch 'master' into issu54
added fix for issue 54