testing new branch thing
Merge pull request #1 from blahu/testing

 testing new branch thing, ok - merging