Issue 11, issue 32
Merge pull request #34 from jam231/kaiks

Issue 11, issue 32