updates
Merge pull request #89 from thequbit/master

updates