Merge pull request #7 from brint/master

Updating labels, adding tests
Renaming image to operating system