Moved Warning label, is now less annoying
moved a line of code to make things neat
Merges remote changes in.
Merge branch 'develop' of https://github.com/robrix/meconation into develop