several changes from list
Merge pull request #52 from ryanricig/master

Changes from list