finally pushing this
Merge pull request #125 from dbcfoxes2014/dan_changes

finally pushing this