resolves #4

@CARammelkamp
~requested 120
#4