update #79
update #58
update #80
Merge pull request #5 from joesnason/master

update #79