Merging my master into the main master

A few fixes
 * fixes UPCASE namespace error.
 * added files to git ignore.