Merge pull request #1 from nosql/master

fork update
v1
Merge pull request #2 from nosql/master

fork update
Merge pull request #3 from nosql/master

fork update
2
Merge pull request #93 from FiskSMK/master

1 a-d