Merge pull request #54 from johanjusits/branch-1

Branch 1