fixing changes in reflection
fixed counting of parameters
changed the way a map is being serialized
Merge pull request #15 from Rovak/develop

Updated Factory with changes in reflection