Missed commits
Merge pull request #2 from adamjodonnell/restrictions

Missed commits