Merge pull request #107 from jstrimpel/master

moved after server initialize code
removed data- prefix to be consistent with other attributes