Merge pull request #1 from JanMattner/master

Add Test file
Add new feature
Merge new feature from original AIT project