Merge pull request #1 from mrstocks/master

merging
Merge pull request #17 from najela/master

Merge pull request #1 from mrstocks/master