Merge pull request #2 from mrstocks/master

Merging
Pointless Fixes
Merge pull request #18 from najela/master

Pointless fixes