Merge pull request #16 from TeeheeLP/dev

Dev
Merge pull request #17 from TeeheeLP/dev

Update to Version 1.2.3
Merge pull request #18 from TeeheeLP/dev

Dev
Merge pull request #19 from TeeheeLP/dev

Version 1.2.4
Merge pull request #20 from TeeheeLP/master

Pull