Fixed issue #94
Revert "Fixed issue #94"

This reverts commit 42942ef2d59c20401376e125e084cc41fa07e2b6.
Fix issue #94 - Superseding size property of VariablesMap if size variable is present in map.
Adapt code to guidelines, check target for VariablesMap, unnecessary check for string removed, change new Integer(...) to Integer.valueOf(...)
Test size variable in VariablesMap
Merge pull request #116 from michal-kreuzman/2.0-dev

Fixed issue #94