Merge pull request #1 from HeardLibrary/master

Update
Merge pull request #7 from graytl/master

Merge pull request #1 from HeardLibrary/master
Merge pull request #12 from HeardLibrary/master

update from heard