Fixing issue where login.main does not exist
Merge branch 'develop'