Develop

Issue 29; Hidden and Locked behavior.