Cleaned some code and testing commit
Merge origin/master