v0.3.5

Refactored the code to shrink the amount of lines