Issue #20 - Include encoding
Issue #8 - Upgrade to java 7
Merge branch 'develop' into feature/issue-20
Issue #20 - Reduce cyclomatic complexity