Merge pull request #6 from capSAR273/dev

Merge pull request #5 from capSAR273/master
Merge pull request #7 from capSAR273/master

Merge pull request #6 from capSAR273/dev