Merge pull request #5 from baileys2/master

segfadsg
Commiting some changes
Merge pull request #4 from aczirkle/master

Update