Merge pull request #17 from itayB/master

last updates
Added manual input
Merge branch 'master' of https://github.com/prsnca/placemarkr
Merge pull request #16 from prsnca/master

updates from Yaron