deprecated code removed
property file changed to Merlin.properties
Merge pull request #71 from pisaychuk/master

Changed property file to new, deprecated code removed