Kannel - Issue 22

Issue 22 1
Issue 22 2
Issue 22 3
Issue 22 4