Merge pull request #37 from spullara/patch-1 Reducing the lines of code from 1 million to 1 thousand