Updating to current version
Fixed problems
Merge pull request #21 from chrisbenda/master

Pull request
Merge pull request #22 from Ramona2020/master

Testing this crazy system
Merge branch 'pr/23'

Merged changes
Merge remote-tracking branch 'upstream/master'