#421 Fixed following issue(s):
- Added disabled attribute