Merge pull request #13 from AlexNaj/dev

Dev
Merge pull request #14 from jparishy/dev

Merge pull request #13 from AlexNaj/dev