Merge pull request #305 from treeowl/restriction