Fix issue 28
Merge pull request #31 from jam231/kaiks

Fix issue 28