Merge pull request #2 from Datafable/dev

Diveboard Datpaper
Merge pull request #6 from Datafable/master

Merge pull request #2 from Datafable/dev