second review and fixes
Merge pull request #2 from Georepublic/master

second review and fixes