resolves #1

@CARammelkamp
~requested 300
#1