Foreman 1.5 rebase
Merge pull request #5 from ares/master

Foreman 1.5 rebase