Consistent alignment and RC update
Merge pull request #11 from tonk/NewControl

Consistent alignment and RC update