Kannel - Issue 25

Issue 25 1
Issue 25 2
Issue 25 3