Resolves issue #11

~moderator @ScottBishop
requested: 280