Semi-added unbounded
Merge branch 'master' into goodness
Less ugly + unbounded
Merge pull request #24 from clottman/goodness

Goodness