updates and fixes
Merge pull request #10 from dandroid88/master

updates and fixes from dandroid88