Merge pull request #12 from standage/master

Added check for top-level features