Lot of things
Merge pull request #1 from onebone/patch-1

Lot of things