Merge pull request #12 from pedzed/master

Refactored code
Not trimming whitespace.
Added package info.