Fixed naming issues and parsing issues.
Merge branch 'origin/dev'