Merge pull request #260 from k3xr/master

Hands on