resolves #7

~moderator: @ScottBishop

~requested: 80

#7