Refactor to better handle individual cases
Remove blanks
Merge pull request #1 from bendyorke/master

v0.1.0