simplified
restored complexity
fudged simplicity
Merge pull request #5 from JackDougherty/gh-pages

updated