added keywords properties and fix JSON as discussed in issue #24