(test commit)
Merge pull request #3 from JSmyzek/master

(test commit)