Resolves JIRA 48.

Signed-off-by: Spencer George <george3@uwm.edu>