Pr/5

PR #5 from @kwark + code review