Merge pull request #7 from mralext20/master

give me a sec....
Merge pull request #9 from mralext20/dev

Merge pull request #7 from mralext20/master