Merge pull request #32 from johanjusits/branch-1

Branch 1