Remove use of deprecated has_key and strip some whitespace
Merge pull request #22 from zkanda/master

Remove use of deprecated has_key and strip some whitespace