Merge pull request #14 from brack/master

data hookups and stuff