merge spec file conflicts.
Merge pull request #2 from maebeale/master

merge spec file conflicts.