Updates on some answers
Merge pull request #15 from jaytaph/wip/31mar

Updates on some answers