Some updates
Merge pull request #87 from loxdegio/master

Some updates