Merge pull request #3 from Ncionic/master

Merge testfile into experimental for update purposes
Milestone hit

The three files before the 15th milestone has been hit.
Merge pull request #4 from Ncionic/experimental

Experimental