Merge pull request #33 from thgh/master

Some changes and additions
Merge remote-tracking branch 'refs/remotes/mineforeman/master'