Merge pull request #11 from gllmflndn/master

enh: new entities