Merge pull request #52 from johanjusits/branch-1

Branch 1