Merge pull request #1 from JamezQ/master

Mergin new stuff ...