added country code feature
added javadoc
Merge branch 'feature_6' into development