first commit
Merge pull request #3 from nikmac/test2

first commit