Issue 6

@njam please review