Merge pull request #33 from johanjusits/branch-1

hotfix