Minor changes
Minor changes
Updated .gitignore
Few minor cleanups
Merge branch 'development'