Clean Code for issue #94
Merge pull request #119 from MirkoPizii/beta

Clean Code for issue #94