Resolve #5 Applying hotfix to master branch