Correct discipline edit added
frame size and rename disciplines fixes
Merge pull request #17 from Archon033/master

Correct discipline edit added