Merge pull request #3 from mrstocks/master

Updating
Merge pull request #36 from najela/master

Merge pull request #3 from mrstocks/master