resolves #1

Moderator: @CommanderHamster
~requested 100
#1