features part
Merge pull request #2 from MirtlBu/master

features part