added hotfix
added issue53 change
merged