v1.0.0

Merge pull request #102 from GoTeamEpsilon/implementing_manuels_code_…

…review_suggestions

Implements Manuel's code review suggestions