Version 2 Final

Cleaning up mostly compile warnings
ds store!!!
Final version 2
Merge pull request #19 from phylodex/version_2

Version 2