Merge pull request #24 from johanjusits/branch-1

Branch 1