#41 removed spaces, cleand up spaces and other bugs
Merge branch 'master' into production