Fix for #117 and #116
Merge pull request #119 from topcoat/fix_component_json

Fix for #117 and #116