Merge pull request #2 from sandBoxMasters/master

DN 1
Merge pull request #16 from asa2014/master

Merge pull request #2 from sandBoxMasters/master